Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge latest main changes into feature/serverless #1253

Conversation

joshuaauerbachwatson
Copy link
Contributor

This PR simply catches the feature/serverless branch up with commits already present on main. This is preparation for a planned merge of the feature branch into main coming soon.

A similar "reverse merge" was done pretty recently but activity on the main branch has been high.

nicktate and others added 12 commits September 20, 2022 12:09
* Feature/appdev (digitalocean#1204)

* apps: add base scaffolding for app dev command subtree

* charm templates: change up method signatures for easier use

* only use 1.18.x in ci

* add internal package to unit test

* disable interactive mode

* only use logging pager in interactive mode

Co-authored-by: Kamal Nasser <[email protected]>

* extract pager component and improve build log output

* Add support for an app dev config and management (digitalocean#1208)

* Add support for build environment variables (digitalocean#1209)

* confirmation prompt component

* text input component

* Add support for build command overrides (digitalocean#1211)

* Add copy on write support for CNB builds (digitalocean#1213)

* confirm: display result options

* split off list subpackage

* split off pager subpackage

* split off template and textbox packages

* StyledText for icons

* split off text component

* improve indent util

* confirm: clarify prompt persistance behavior

* Add snap support for docker interface for app dev builds (digitalocean#1214)

* Add snap support for docker interface for app dev builds

* add snap warning message

* support cnb versioning, clean up build envs (digitalocean#1215)

* add support for local cnb caching (digitalocean#1216)

* add support for local cnb caching

* address pr feedback

* charm: improved output handling, add warning textbox variant

* add config interfaces and types

* use new config interfaces, add support for per-component config

* address pr feedback, app dev workspace

* structured config

* unexport Config.AppID and config.AppSpecPath

* unexport internal method

* fix unclosed file handler in tests

* test setting and unsetting component-level settings

* appdev: handle user cancellation, log pager styling updates (digitalocean#1229)

* correctly handle user cancellation

* log pager: update header/footer styling, scroll indicator

* log pager: add title spinner

* add support to build static site server image

* add docker support for static builds

* docker static site build cleanup

* docker static site build tests

* cnb static site build cleanup

* cnb static site build tests

* docker static site build input validation updates

remove /var/run/docker.sock dependency from tests

* fix path handling on windows

* intercept ctrl-c to exit cleanly

* Ntate/appdev/macossupport (digitalocean#1235)

* mount docker.sock.raw for mac docker-for-desktop

* update local builder to v0.50.2

* support for windows docker-for-desktop (digitalocean#1238)

* appdev: pull required container images (digitalocean#1240)

* pull required container images

* pull cnb stack run image

* update no app spec error message

* vendor latest godo

* bump godo to v1.85.0

* support new godo interface types

* address pr feedback

* add better help messaging for app dev config

Co-authored-by: Kamal Nasser <[email protected]>
* fix image pull progress bar

* print custom builder image override to screen

* functions build guidance

* improved onboarding

* print next steps after a successful build, use correct image names for static sites

* style fixups

* highlight current app dev workspace in multiple places

* Update commands/apps_dev.go

Co-authored-by: Andrew Starr-Bochicchio <[email protected]>

* fix rebase oversight

* go mod tidy & vendor

* fix template string

Co-authored-by: Andrew Starr-Bochicchio <[email protected]>
@joshuaauerbachwatson joshuaauerbachwatson merged commit 083868e into digitalocean:feature/serverless Sep 27, 2022
@joshuaauerbachwatson joshuaauerbachwatson deleted the latest-main branch October 4, 2022 17:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants